From 367b4eb0ffbd99fdd030e87fd08a9c7ac39d5bd5 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 30 Dec 2013 13:17:43 +0800 Subject: [PATCH] Rework the Visual Studio 2010 Projects a bit Add a utility project to get config.h and gdkconfig.h from their *.h.win32 (or win32_broadway, if applicable) counterparts, using custom build rules, so that these "generated" files can also be removed on clean and "regenerated" upon update. This also enables the removal of configs in certain projects that isn't really needed as a result. Also update and merge the projects and property sheets to include a single property sheet that it needs, which will then in turn include the other property sheets that is needed, so that things are cleaner. --- build/win32/vs10/Makefile.am | 12 +- build/win32/vs10/broadwayd.vcxproj | 10 +- build/win32/vs10/gdk-broadway.vcxproj | 10 +- build/win32/vs10/gdk-win32.vcxproj | 112 +-------- build/win32/vs10/gdk.vcxprojin | 8 - build/win32/vs10/gtk+.sln | 126 +++++----- build/win32/vs10/gtk-copy-gdk-broadway.props | 3 + build/win32/vs10/gtk-gen-sources.props | 20 -- build/win32/vs10/gtk-gen-srcs.props | 85 +++++++ build/win32/vs10/gtk-gengir.props | 1 - build/win32/vs10/gtk-ignore-broadway.props | 3 + build/win32/vs10/gtk-install-bin.props | 69 ------ ...l-headers-data.props => gtk-install.props} | 59 ++++- build/win32/vs10/gtk-prebuild.vcxproj | 218 ++++++++++++++++++ build/win32/vs10/gtk.vcxprojin | 16 +- build/win32/vs10/gtka11y.vcxprojin | 115 +-------- build/win32/vs10/gtkprebuild-broadway.props | 41 ---- build/win32/vs10/gtkprebuild.props | 45 ---- build/win32/vs10/install.vcxproj | 32 +-- 19 files changed, 475 insertions(+), 510 deletions(-) delete mode 100644 build/win32/vs10/gtk-gen-sources.props create mode 100644 build/win32/vs10/gtk-gen-srcs.props delete mode 100644 build/win32/vs10/gtk-install-bin.props rename build/win32/vs10/{gtk-install-headers-data.props => gtk-install.props} (93%) create mode 100644 build/win32/vs10/gtk-prebuild.vcxproj delete mode 100644 build/win32/vs10/gtkprebuild-broadway.props delete mode 100644 build/win32/vs10/gtkprebuild.props diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 0a0120ba6f..4aa7593069 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.decl EXTRA_DIST += \ README.txt \ gtk+.sln \ + gtk-prebuild.vcxproj \ gdk-win32.vcxproj \ gdk-win32.vcxproj.filters \ gdk.vcxproj \ @@ -30,14 +31,11 @@ EXTRA_DIST += \ gdk-broadway.vcxproj \ gdk-broadway.vcxproj.filters \ gtk-build-defines.props \ + gtk-copy-gdk-broadway.props \ + gtk-gen-srcs.props \ gtk-gengir.props \ gtk-ignore-broadway.props \ - gtk-install-bin.props \ - gtk-install-headers-data.props \ - gtk-version-paths.props \ - gtkprebuild-broadway.props \ - gtkprebuild.props \ - gtk-copy-gdk-broadway.props \ - gtk-gen-sources.props + gtk-install.props \ + gtk-version-paths.props -include $(top_srcdir)/git.mk diff --git a/build/win32/vs10/broadwayd.vcxproj b/build/win32/vs10/broadwayd.vcxproj index f3d58eb872..35fc409a14 100644 --- a/build/win32/vs10/broadwayd.vcxproj +++ b/build/win32/vs10/broadwayd.vcxproj @@ -52,22 +52,18 @@ - - - - @@ -172,6 +168,12 @@ + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff} + false + + diff --git a/build/win32/vs10/gdk-broadway.vcxproj b/build/win32/vs10/gdk-broadway.vcxproj index d6075d8cf1..3f1fc1c2ad 100644 --- a/build/win32/vs10/gdk-broadway.vcxproj +++ b/build/win32/vs10/gdk-broadway.vcxproj @@ -52,22 +52,18 @@ - - - - @@ -137,6 +133,12 @@ + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff} + false + + diff --git a/build/win32/vs10/gdk-win32.vcxproj b/build/win32/vs10/gdk-win32.vcxproj index b683a96d3f..2aae284228 100644 --- a/build/win32/vs10/gdk-win32.vcxproj +++ b/build/win32/vs10/gdk-win32.vcxproj @@ -17,22 +17,6 @@ Release x64 - - Debug_Broadway - Win32 - - - Debug_Broadway - x64 - - - Release_Broadway - Win32 - - - Release_Broadway - x64 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} @@ -62,66 +46,24 @@ MultiByte v100 - - StaticLibrary - MultiByte - true - v100 - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - true - v100 - - - StaticLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - @@ -138,20 +80,6 @@ EditAndContinue - - - Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) @@ -163,17 +91,6 @@ ProgramDatabase - - - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - Disabled @@ -188,20 +105,6 @@ ProgramDatabase - - - Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) @@ -213,17 +116,6 @@ ProgramDatabase - - - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - @@ -248,8 +140,8 @@ - - {3281202a-cd26-4c67-b892-eb34bdbc6130} + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff} false diff --git a/build/win32/vs10/gdk.vcxprojin b/build/win32/vs10/gdk.vcxprojin index d8d07278bf..2b393e0279 100644 --- a/build/win32/vs10/gdk.vcxprojin +++ b/build/win32/vs10/gdk.vcxprojin @@ -89,42 +89,34 @@ - - - - - - - - diff --git a/build/win32/vs10/gtk+.sln b/build/win32/vs10/gtk+.sln index e4316bba52..41d48f95c0 100644 --- a/build/win32/vs10/gtk+.sln +++ b/build/win32/vs10/gtk+.sln @@ -1,27 +1,29 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-prebuild", "gtk-prebuild.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-broadway", "gdk-broadway.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC6130}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gtk3-demo-application.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC612F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-broadway", "gdk-broadway.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC6130}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -34,6 +36,22 @@ Global Release_Broadway|x64 = Release_Broadway|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Debug|Win32.ActiveCfg = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Debug|Win32.Build.0 = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Debug|x64.ActiveCfg = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Debug|x64.Build.0 = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Release|Win32.ActiveCfg = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Release|Win32.Build.0 = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Release|x64.ActiveCfg = Release|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Release|x64.Build.0 = Release|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.ActiveCfg = Debug|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.Build.0 = Debug|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.ActiveCfg = Debug|x64 @@ -42,14 +60,38 @@ Global {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.Build.0 = Release|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.ActiveCfg = Release|x64 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.Build.0 = Release|x64 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|x64.Build.0 = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|Win32.Build.0 = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|x64.ActiveCfg = Release|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|x64.Build.0 = Release|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug|Win32.ActiveCfg = Debug_Broadway|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug|x64.ActiveCfg = Debug_Broadway|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release|Win32.ActiveCfg = Release_Broadway|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release|x64.ActiveCfg = Release_Broadway|x64 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug|Win32.ActiveCfg = Debug_Broadway|Win32 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug|x64.ActiveCfg = Debug_Broadway|x64 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release|Win32.ActiveCfg = Release_Broadway|Win32 + {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release|x64.ActiveCfg = Release_Broadway|x64 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.ActiveCfg = Debug|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.Build.0 = Debug|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.ActiveCfg = Debug|x64 @@ -66,6 +108,22 @@ Global {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.ActiveCfg = Debug|Win32 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.Build.0 = Debug|Win32 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.ActiveCfg = Debug|x64 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.Build.0 = Debug|x64 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.ActiveCfg = Release|Win32 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.Build.0 = Release|Win32 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.ActiveCfg = Release|x64 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.Build.0 = Release|x64 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.Build.0 = Debug|x64 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.Build.0 = Release|Win32 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.ActiveCfg = Release|x64 + {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.Build.0 = Release|x64 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64 @@ -98,22 +156,6 @@ Global {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release_Broadway|Win32.Build.0 = Release|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release_Broadway|x64.ActiveCfg = Release|x64 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release_Broadway|x64.Build.0 = Release|x64 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.ActiveCfg = Debug|Win32 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.Build.0 = Debug|Win32 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.ActiveCfg = Debug|x64 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.Build.0 = Debug|x64 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.ActiveCfg = Release|Win32 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.Build.0 = Release|Win32 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.ActiveCfg = Release|x64 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.Build.0 = Release|x64 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.ActiveCfg = Debug|Win32 {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.Build.0 = Debug|Win32 {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|x64.ActiveCfg = Debug|x64 @@ -170,30 +212,6 @@ Global {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|x64.ActiveCfg = Debug|x64 {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|Win32.ActiveCfg = Release|Win32 {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|x64.ActiveCfg = Release|x64 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug|Win32.ActiveCfg = Debug_Broadway|Win32 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug|x64.ActiveCfg = Debug_Broadway|x64 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release|Win32.ActiveCfg = Release_Broadway|Win32 - {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release|x64.ActiveCfg = Release_Broadway|x64 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug|Win32.ActiveCfg = Debug_Broadway|Win32 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug|x64.ActiveCfg = Debug_Broadway|x64 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release|Win32.ActiveCfg = Release_Broadway|Win32 - {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release|x64.ActiveCfg = Release_Broadway|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/win32/vs10/gtk-copy-gdk-broadway.props b/build/win32/vs10/gtk-copy-gdk-broadway.props index 22455163ac..d62e744146 100644 --- a/build/win32/vs10/gtk-copy-gdk-broadway.props +++ b/build/win32/vs10/gtk-copy-gdk-broadway.props @@ -1,5 +1,8 @@  + + + <_PropertySheetDisplayName>gtkcopygdkbroadwayprops diff --git a/build/win32/vs10/gtk-gen-sources.props b/build/win32/vs10/gtk-gen-sources.props deleted file mode 100644 index c85bee3e90..0000000000 --- a/build/win32/vs10/gtk-gen-sources.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - -cd ..\..\..\gtk - -python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml - -cd $(SolutionDir) - - - - - $(GenerateGtkDbusBuiltSources) - - - \ No newline at end of file diff --git a/build/win32/vs10/gtk-gen-srcs.props b/build/win32/vs10/gtk-gen-srcs.props new file mode 100644 index 0000000000..30c3d40c7b --- /dev/null +++ b/build/win32/vs10/gtk-gen-srcs.props @@ -0,0 +1,85 @@ + + + + + + + +copy ..\..\..\config.h.win32 ..\..\..\config.h + + +if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H + +if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h + +if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD + +if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway + +if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll + +if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib + +if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug + +if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release + +copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h + +copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD + +echo $(Configuration) > ..\..\..\MSVC_$(Configuration) + +:DONE_GDKCONFIG_H + + +if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H + + +if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h + +if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD + +if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release + +if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug + + +if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway + +if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway + +copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h + +copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD + +echo $(Configuration) > ..\..\..\MSVC_$(Configuration) + +:DONE_GDKCONFIG_H + + +cd ..\..\..\gtk + +python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml + +cd $(SolutionDir) + + + + <_PropertySheetDisplayName>gtkgensrcsprops + + + + $(GenConfigH) + + + $(GenGdkConfigHWin32) + + + $(GenGdkConfigHBroadway) + + + $(GenerateGtkDbusBuiltSources) + + + \ No newline at end of file diff --git a/build/win32/vs10/gtk-gengir.props b/build/win32/vs10/gtk-gengir.props index 7f69b4085a..fc2a288736 100644 --- a/build/win32/vs10/gtk-gengir.props +++ b/build/win32/vs10/gtk-gengir.props @@ -1,7 +1,6 @@  - diff --git a/build/win32/vs10/gtk-ignore-broadway.props b/build/win32/vs10/gtk-ignore-broadway.props index d5d2d63e9c..cbe02f7774 100644 --- a/build/win32/vs10/gtk-ignore-broadway.props +++ b/build/win32/vs10/gtk-ignore-broadway.props @@ -1,5 +1,8 @@  + + + <_PropertySheetDisplayName>gtkignorebroadwayprops diff --git a/build/win32/vs10/gtk-install-bin.props b/build/win32/vs10/gtk-install-bin.props deleted file mode 100644 index 3f65b177c1..0000000000 --- a/build/win32/vs10/gtk-install-bin.props +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - -mkdir $(CopyDir)\bin - -mkdir $(CopyDir)\lib - - -if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN - -if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN - - -copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin - -copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib - -copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin - -goto DONE_BIN - - -:DO_BROADWAY_BIN - -copy $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin - -copy $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib - -copy $(Configuration)\$(Platform)\bin\broadwayd.exe $(CopyDir)\bin - - -if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin - -if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin - -if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib - -if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib - -if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*.exe $(CopyDir)\bin - - -if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin - -if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin - -if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib - -if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib - -if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*.exe $(CopyDir)\bin - -:DONE_BIN - - - - - <_PropertySheetDisplayName>gtkinstallbinprops - - - - $(GtkDoInstallBin) - - - \ No newline at end of file diff --git a/build/win32/vs10/gtk-install-headers-data.props b/build/win32/vs10/gtk-install.props similarity index 93% rename from build/win32/vs10/gtk-install-headers-data.props rename to build/win32/vs10/gtk-install.props index 4592470862..5980c3a4a3 100644 --- a/build/win32/vs10/gtk-install-headers-data.props +++ b/build/win32/vs10/gtk-install.props @@ -1,9 +1,61 @@  - + + +mkdir $(CopyDir)\bin + +mkdir $(CopyDir)\lib + + +if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN + +if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN + + +copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin + +copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib + +copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin + +goto DONE_BIN + + +:DO_BROADWAY_BIN + +copy $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin + +copy $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib + +copy $(Configuration)\$(Platform)\bin\broadwayd.exe $(CopyDir)\bin + + +if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib + +if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib + +if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*.exe $(CopyDir)\bin + + +if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib + +if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib + +if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*.exe $(CopyDir)\bin + +:DONE_BIN + echo off @@ -717,9 +769,12 @@ copy ..\..\..\gdk\broadway\gdkbroadwayvisual.h $(CopyDir)\include\gtk-$(ApiVersi - <_PropertySheetDisplayName>gtkinstallheadersdataprops + <_PropertySheetDisplayName>gtkinstallsprops + + $(GtkDoInstallBin) + $(GtkDoInstall) diff --git a/build/win32/vs10/gtk-prebuild.vcxproj b/build/win32/vs10/gtk-prebuild.vcxproj new file mode 100644 index 0000000000..b5031b499e --- /dev/null +++ b/build/win32/vs10/gtk-prebuild.vcxproj @@ -0,0 +1,218 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Debug_Broadway + Win32 + + + Debug_Broadway + x64 + + + Release_Broadway + Win32 + + + Release_Broadway + x64 + + + + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} + gtkprebuild + Win32Proj + + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + + + + + + + + + + + + + + + + + + + + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + + + Copying gdkconfig from gdkconfig.win32... + $(GenGdkConfigHWin32) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs) + Copying gdkconfig from gdkconfig.win32... + $(GenGdkConfigHWin32) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs) + Copying gdkconfig from gdkconfig.win32... + $(GenGdkConfigHWin32) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs) + Copying gdkconfig from gdkconfig.win32... + $(GenGdkConfigHWin32) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs) + + + Copying gdkconfig from gdkconfig.win32_broadway... + $(GenGdkConfigHBroadway) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs) + Copying gdkconfig from gdkconfig.win32_broadway... + $(GenGdkConfigHBroadway) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs) + Copying gdkconfig from gdkconfig.win32_broadway... + $(GenGdkConfigHBroadway) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs) + Copying gdkconfig from gdkconfig.win32_broadway... + $(GenGdkConfigHBroadway) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs) + + + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin index 80a94b3c53..0f56406f29 100644 --- a/build/win32/vs10/gtk.vcxprojin +++ b/build/win32/vs10/gtk.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + @@ -162,16 +162,16 @@ Generating GTK+ DBus Sources... $(GenerateGtkDbusBuiltSources) - ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h%(Outputs) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) Generating GTK+ DBus Sources... $(GenerateGtkDbusBuiltSources) - ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h%(Outputs) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) Generating GTK+ DBus Sources... $(GenerateGtkDbusBuiltSources) - ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h%(Outputs) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) Generating GTK+ DBus Sources... $(GenerateGtkDbusBuiltSources) - ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h%(Outputs) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) diff --git a/build/win32/vs10/gtka11y.vcxprojin b/build/win32/vs10/gtka11y.vcxprojin index cc9e074dbd..67d716fb38 100644 --- a/build/win32/vs10/gtka11y.vcxprojin +++ b/build/win32/vs10/gtka11y.vcxprojin @@ -17,22 +17,6 @@ Release x64 - - Debug_Broadway - Win32 - - - Debug_Broadway - x64 - - - Release_Broadway - Win32 - - - Release_Broadway - x64 - {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46} @@ -62,66 +46,24 @@ MultiByte v100 - - StaticLibrary - MultiByte - true - v100 - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - true - v100 - - - StaticLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - @@ -138,20 +80,6 @@ EditAndContinue - - - Disabled - _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - Disabled @@ -166,20 +94,6 @@ ProgramDatabase - - - Disabled - _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - MaxSpeed @@ -194,20 +108,6 @@ ProgramDatabase - - - MaxSpeed - true - $(GtkDefines);%(PreprocessorDefinitions) - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - $(GtkDefines);%(PreprocessorDefinitions) @@ -219,23 +119,12 @@ ProgramDatabase - - - $(GtkDefines);%(PreprocessorDefinitions) - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - #include "gtka11y.vs10.sourcefiles" - - {3281202a-cd26-4c67-b892-eb34bdbc6130} + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff} false diff --git a/build/win32/vs10/gtkprebuild-broadway.props b/build/win32/vs10/gtkprebuild-broadway.props deleted file mode 100644 index 1b6cf92481..0000000000 --- a/build/win32/vs10/gtkprebuild-broadway.props +++ /dev/null @@ -1,41 +0,0 @@ - - - - <_PropertySheetDisplayName>gtkprebuild_broadwayprops - - - - -if exist ..\..\..\config.h goto DONE_CONFIG_H - -copy ..\..\..\config.h.win32 ..\..\..\config.h - -:DONE_CONFIG_H - - -if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H - -if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h - -if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD - -if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release - -if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug - -if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway - -if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway - -copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h - -copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD - -echo $(Configuration) > ..\..\..\MSVC_$(Configuration) - -:DONE_GDKCONFIG_H - - - - - \ No newline at end of file diff --git a/build/win32/vs10/gtkprebuild.props b/build/win32/vs10/gtkprebuild.props deleted file mode 100644 index 7ec9712c7d..0000000000 --- a/build/win32/vs10/gtkprebuild.props +++ /dev/null @@ -1,45 +0,0 @@ - - - - <_PropertySheetDisplayName>gtkprebuildprops - - - - -if exist ..\..\..\config.h goto DONE_CONFIG_H - -copy ..\..\..\config.h.win32 ..\..\..\config.h - -:DONE_CONFIG_H - - -if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H - -if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h - -if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD - -if exist ..\..\..\MSVC_Release_Broadway del ..\..\..\MSVC_Release_Broadway - -if exist ..\..\..\MSVC_Debug_Broadway del ..\..\..\MSVC_Debug_Broadway - -if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll - -if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib - -if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug - -if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release - -copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h - -copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD - -echo $(Configuration) > ..\..\..\MSVC_$(Configuration) - -:DONE_GDKCONFIG_H - - - - - \ No newline at end of file diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index e46e41a93a..4fcc4ee7b9 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -89,51 +89,35 @@ - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + -- 2.30.2